Skip to content

Conversation

danbev
Copy link
Member

@danbev danbev commented Mar 31, 2025

This commit updates the ggml source to include the new unary and binary operations. I merged #2958 which seems to have overwritten the changes to the ggml source which were added in #2972.

Sorry about this.

This commit updates the ggml source to include the new unary and binary
operations. I merged ggml-org#2958
which seems to have overwritten the changes to the ggml source which
were added in ggml-org#2972.

Sorry about this.
@danbev
Copy link
Member Author

danbev commented Mar 31, 2025

@ggerganov I think I broke CI when I merged #2958 😞 I should have rebased that PR before merging.

@ggerganov
Copy link
Member

Btw, it didn't overwrite the changes. There are two Android examples:

  • whisper.android
  • whisper.android.java

In #2972 I updated only the first one and forgot about the second one.

@danbev danbev merged commit e153b8e into ggml-org:master Mar 31, 2025
48 checks passed
@danbev danbev deleted the android-java-ggml-source-update branch April 1, 2025 03:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants